-
Notifications
You must be signed in to change notification settings - Fork 45
Add desired host phase 2 contents to blueprint #8570
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…lude host phase 2)
This was referenced Jul 11, 2025
andrewjstone
approved these changes
Jul 11, 2025
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks great!
@@ -1581,6 +1582,8 @@ pub(crate) fn build_initial_blueprint_from_sled_configs( | |||
disks: sled_config.disks.clone(), | |||
datasets, | |||
zones: sled_config.zones.iter().cloned().collect(), | |||
host_phase_2: BlueprintHostPhase2DesiredSlots::current_contents( |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Strange formatting choice by rustfmt.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a followup to the stack of PRs that added desired host phase 2 contents to
OmicronSledConfig
(#8538 and its followups). We now have aBlueprintHostPhase2DesiredSlots
inside eachBlueprintSledConfig
that specifies the desired contents (artifact by hash-and-version or "just the current contents", analogous to the install dataset for zones) for each of the two phase 2 slots.The actual diff is much smaller than github claims; ~75% of the diff here is expectorate output that changed because our blueprint displays and diffs now include a table for this new information.